kdiff3

KDiff3 is a diff and merge program.

Details